set popup_in_progress to TRUE, (gtk_combo_box_menu_show): and back to

Tue Sep 30 21:43:34 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
	popup_in_progress to TRUE,
	(gtk_combo_box_menu_show): and back to FALSE here; the menu now
	won't disappear on the first button release. (Reported by Matthias
	Clasen).

diff --git a/ChangeLog b/ChangeLog
index 65ed4284910fbca938e9cadf43ca8bf458612499..9c226228cb31534536460c1635e3ed0fbf4ad67f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 30 21:43:34 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
+       popup_in_progress to TRUE,
+       (gtk_combo_box_menu_show): and back to FALSE here; the menu now
+       won't disappear on the first button release. (Reported by Matthias
+       Clasen).
+
 Tue Sep 30 21:08:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 65ed4284910fbca938e9cadf43ca8bf458612499..9c226228cb31534536460c1635e3ed0fbf4ad67f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Sep 30 21:43:34 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
+       popup_in_progress to TRUE,
+       (gtk_combo_box_menu_show): and back to FALSE here; the menu now
+       won't disappear on the first button release. (Reported by Matthias
+       Clasen).
+
 Tue Sep 30 21:08:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 65ed4284910fbca938e9cadf43ca8bf458612499..9c226228cb31534536460c1635e3ed0fbf4ad67f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Sep 30 21:43:34 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
+       popup_in_progress to TRUE,
+       (gtk_combo_box_menu_show): and back to FALSE here; the menu now
+       won't disappear on the first button release. (Reported by Matthias
+       Clasen).
+
 Tue Sep 30 21:08:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 65ed4284910fbca938e9cadf43ca8bf458612499..9c226228cb31534536460c1635e3ed0fbf4ad67f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Sep 30 21:43:34 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
+       popup_in_progress to TRUE,
+       (gtk_combo_box_menu_show): and back to FALSE here; the menu now
+       won't disappear on the first button release. (Reported by Matthias
+       Clasen).
+
 Tue Sep 30 21:08:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 65ed4284910fbca938e9cadf43ca8bf458612499..9c226228cb31534536460c1635e3ed0fbf4ad67f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Sep 30 21:43:34 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_menu_button_press): set
+       popup_in_progress to TRUE,
+       (gtk_combo_box_menu_show): and back to FALSE here; the menu now
+       won't disappear on the first button release. (Reported by Matthias
+       Clasen).
+
 Tue Sep 30 21:08:43 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child.

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 5c4a01d380d1a56475d3e9af3f700bd4d7306211..332dfa3b8572a4c43b7ed359c5defe4142d408c9 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -571,6 +571,7 @@ gtk_combo_box_menu_show (GtkWidget *menu,
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
                                 TRUE);
+  combo_box->priv->popup_in_progress = FALSE;
 }
 
 static void
@@ -1431,6 +1432,7 @@ gtk_combo_box_menu_button_press (GtkWidget      *widget,
 
   if (event->type == GDK_BUTTON_PRESS && event->button == 1)
     {
+      combo_box->priv->popup_in_progress = TRUE;
       gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),
                       NULL, NULL,
                       gtk_combo_box_menu_position, combo_box,